Updates on HMVC and template