Added support for application prefixes