Added some state saving infrastructure