Re-implement changes in the AppHelper