Some slight reorganization, change added getters to MediaResource