Added support for application working environment