refine handlers