modified in order to support the new connection string and libraries