Updated template, added custom headers