Improved subnet handling.