Better metadata management