Removed the TemplateSelector. Unnecessary.