Improve BasicNetwork plugin