eclass improvements