Added support for the new picture model
Added a check for empty list
Don't remember what I did :p
Still working on this one. Removed unnecessary checks
Fixed some tests after changes