Added support for application directory