Fixed DB scheme
Fixed DB dump