Add unit_id to unique.
WIP: API