Added annotations
Refactored DatabaseSchemaManipulator