Modify ClientStorage to base all the interactions on ids