Changed database scheme to be simpler