Correct DB structure