Some changes to manager
More netty refinement