Working on delegate lookup feature