Moved some delegates to ActiveControllerDelegate