Changes to support the photo album scenario