Add support for templated definitions