Switched to new units4j classes