Consolidate unit handling and use proxy classes.