Re-making map classes