Updated Metadata to namespace different types into nested classes and make it easier to find particular constants