Yogesh || Refactoring media submission