Got rid of switch statement with a simplistic Command pattern