improved api look up