Added metadata and properties properties