BaseApp changed to AppBuilder