Changed database layout slightly