Compatibility with the new API format