Added two classes