Improved support for local networks