Add support for properties
Use the properties