Fix: DB Schema