Added support for custom applications