Added command base and change Locale a little