Fixed Handler Facade + fixed network for new API