Added new new classes