Changes to base template