CC-5800 : Merging File API into new media tables