Added types & lookup functions.