Refactor disruption collection retrieval