Adding support for more apps