Issue #50 - Update to application controller