Updated AppHelper helpers