Changed BaseApp to AppBuilder