Updated to the new App API