Improved SQLArgs and Audit interface; annotations WIP broken