More work on new API implementation.