Improve metadata support