Further changes to api