More migrations to State from Context