Change to inline templating