Reworking of internals of MySqlConnector