Added core data and custom map tile handling