Accept a UniqueIdType instead of duplicating into multiple methods