Improved cmd code in cmd classes ...