Updated MetaDataHandler class.

Improved file structure.