Moved stuff in _base