Improved photo parser