consolidate api
add lookup type support