Prepare for APPSAWG adoption