Now with map tiles and entities