Added support for mobile nodes