Updated compatibility