Added more SQL metrics