Added flickr support