Re-work controller objects