Fixed CS
Added GetSetCommand