[UPDATE] Updates to the API and Metadata classes