Changed Database structure slightly.