Use new units4j classes