Refactoring Value classes and fixed Cursor