Upgrade to using the Metadata API