More stuff for Cursor class
Namespace refactoring
Modules support
Fixed code analysis warnings