Tiny API change, a bit implementing SQL stuff