Further APS Support

APS users are setup a bit differently.