Initial APBC adaptions