Changes and polishing to the API