Restructure WPA loading mechanism...