Updated MediaStorage to reflect previous 2 commits changes