All controllers now use custom controller