Added support for multiple apps