Changed Unit and IUnit fields