Work toward SQL Support
Changes to support SQL support