Updated corecmd class