Add support for more applications