Adding in Mediaserver classes and some other small changes