Refine receiver
Signed-off-by:Ageval Solutions <Ageval Solutions@Ageval>