Refactoring of UnitCharacteristic