Changes to AppStarter