Adding new classes for 0.7 compliance