Changes to config & template