Merged two classes to one