Added Metadata object, removed KeyValues utility
Added Metadata object, removed KeyValues utility