Add support for combined templates