Split classes further