Use direct API where available
Public Release 1.5.5