Added Map API, some templates