The work made for #189 needs to be implemented in the Stream Composition services to keep consistency across all stream services.