Added new classes for features