Code Refactor: Database-Connector rewrite