expanding map classes to handle more maps