Adding support for universal apps