Added support for properties