Add support for properties