Changed DB scheme