Focus on performance.  Implement enum handlers across the board.