VE-1389 Database changes, use FluentSQL