Compatibility with new Remote api