Update value objects to use ValueObject