Added support for applications