More robust photo management system