Added new properties and classes