Better metadata support.