(fix) Fix DB Scheme bugs
Merge pull request #8 from jgladch/fix/schema

(fix) Fix DB Schema bugs