More changes to greendao