Implemented new lookup scheme.
1.0.0