Updated templates. Refactored on a base template.