Update AFD and Semantics