Add ensure_num_units (replace add_or_deply_units)