Prepare for new raw wamp handling