More /lookup changes