Added media service
fixing merge