Controllers refinement