Split the class in two