Update to \rpg\RpgCommand and Util