Enforce State schema
Change forward-to-local, unforward-to-local arguments