working on optimizing template loading

Change-Id: I83023aa085415d2060483d073255d1383eb2b5e2