Minor template changes to organize everything using CompositionRoot