Added tile and panorama support