Added new functionality to CleverExtension