Updated imports
Updated conditionFunctionData