Fencing: controller override refactor