Added Flickr token support