Added some different map functionality