Fixed classes and properties and documentation