Added base templates, includes