Adding lookup function. Also adding missing zid.