Added app params + waiting state in now handled by events