Added simple map functionality.