Issue: #5

  * Fixed app_context structure