Update generic import to avoid infinite loops