more db and SimpleSite modifications