Update for page_manager and form_state changes