Updated the ids to universal values