Changed database structur