Added metadata support