Added additional map features