Update with annotationdb.py and setup.py