Adds full picture & albums support