Clean up
Add new annotationProvider example