improve performance and stability, add network and DB