Yogesh || Refactoring media submission changes