Minor modifications to database and site classes