More updates for compatibility