Better structure of db