added default app argument everywhere which enabled simplification of decorator