Added Class definitions/interfaces