Add dynamic lookup support