VLogics refactoring.
Commands small refactoring.