Improved acv and acf definitions and API