Added more blocks to make customising templates easier