Added metadata support.