Added set_id