Added definition builder for CommandGateway