More updates to reduce quota usage