Added metadata support
Added metadata support