add lookup support