Began separating SQL generation from methods.