First query wrapping.
Added transaction options.
Changed key wrapper to key pointer wrapper.