Move to SWF Next version