upgraded singleton
Template Engine was added