DB Refactoring

Refactoring for altered annotations.
Fixed DB schema bug