added support for properties