Keep up to date with template