Support for API Version 5.4