More work towards the API