modifications to break out lookup from management