Switch to rivr-peewee