Need to redesign database