More 13.4 API support