Improved metadata support.