Changed factory pattern name in Commands