added subblocks and blocks with templates