Further work on API