Unify classes