Add change for better interoperability