Completes Unit classes