Added a couple more lookup types