Add support for modular raw template