some updates for Site class