Removed the chain handler and simplified the lookup.