fix(Client/ModelService) Break switch statements