Feature/refine connection recv