Database structure improved