*Global refactoring - add "const" keys; memory managment improvements;