Switched to using Scala SQLContext