Map update

Made an important update to Map and Point