Added templates for command building