Better integration with cloud version