updating changes to use SqlGenerators and custom statements.