Update to ensure compatibility