Added support for the ICVs interface