Fix integration with networking layer