New database scheme, site structure