TUSCANY-3494 - Applying patch from Florian Pinel to create a new command method that takes in consideration the type of command being created