Fix: DB, Schema, cli