Changed templates to use inheritance rather than includes