Removed some template hardcoding