Changes to inner template