Added new extensionability