upgraded more SQL components