Revert "Remove redundant APC types"

Reverted Commit at the request of Emmanuelbassil