Refine controller behaviour