Added base template, removed redundant stuff