Implemented new classes