added handling for additional lookup fields