Adding map funcionalities