Add blocks to make template customization easier