Continued the template switch implementation

Change-Id: I86fa52f2e13d319127dcd44b98304aa3cc3c7e9e
12 files changed