added support for templated property