Was improved app generator