Update for Unit usage

@paf31