Changed database architecture