DEVKIT-675 Add import + refactor to avoid duplicated code