Change API to match database/sql more closely