Removed custom code, added network plugin