- Added additional checking to statements for drivers that support a number of results affected. - Changed the way we keep imports around for compare values
* Fix Upsert hooks * Rename singleton template files