Redesign Metadata API