Additional support for Desktop app and online editor