Added metadata lookup facilities