CC-5450 : Refactor Media Management

some basic saving going on.