Added metadata helpers