Added auto incrementation for units.