Improved wrapper again, added inflected api support, return to knex