Updated template to support commands