Further deal w/ state schema changes