Rename additional_state to application_base_state