Media API improvement
Media API update