DB Schema fixes
DB schema update
CSV naming convention update