Updated to sync the code with the new version of DBConnector