added basic functionality for maps