Completed transition to peewee ORM