More changes to bring in ORMlite