Refactor to make usable from Storm host.