Change database scheme (issue 1)