Better metadata API