Switch command handlers from inner classes : MCPC+ doesn't handle right