Refactor on MDS Class 08/05

Merging Pull Request of new classes