Some lookup definition changes