Added new block and template commands