Added new Class definitions