Added some map related classes.