Added metadata functionality