Add proper Schema for local state
Clean/Finalize example