Some further work on the new API