Updates to app handler to pass itself to controller