Updated config and header template