Replaced blocks with defs in the templates