Replaced public_id with id