Extension: Updated compatibility with dev version