Add support for APC