Refactor to DbConnector.java