Reworking embedded server API
Autocommit Thu Sep 18 08:32:32 EST 2014