Removed dependency on media_gallery