Refactor Cursor and Refinement into different types