Added panorama support