Fix the API. Add some more info