Added BaseCursor and CursorWaiter.