Added basic map functionality