Lot of template changes to support all features