Applied aesh changes (CommandValidator)