Added support for app UI