With updated models, DB schema, and gem files