Added support for varying on app.type