APC Api improvements