Refactor relative to the streams-details submodule