Added Service provider + refactored the Class name ( Media_* )