Improvements in equiv_struct