API 2 changes for Photoviewing

And more updates