Added support for resource-as-a-property