Added more SQL goodies