Updating branching to include switch and object map