Update form_state objects
Fix annotation constructor