Added more convenience template blocks