DEVKIT-675 Add import + refactor to avoid duplicated code
Merge pull request #1 from mulesoft/DEVKIT-675

DEVKIT-675 Add import + refactor to avoid duplicated code