Unifying template to be more feature driven.
Making template more uniform between inline and application approach.