Adjustments to application controller