Attempt to separate templates more