fixup! fixup! Extract common part from cli and si module