Modifications for templating