Add additional UID in key, and a photo. Fix code to adapt to
new attributes.