Updated AF and separated synthesis items