Support for the new API