More template blocks to allow for easier extension maintenance