More work on API2