Command factory pattern tuned