API Version 5.4 support