Added new classes, not defined hierarchy yet