Updated for PhotoArchive 1.4