Simplify Map class handling.