More WIP on new API support