Add Metadata support.