Refactoring. Introducing Cursor and Table concepts.