Small template initial changes