Add explicit id's to states