Done. I refactored this protocol/datasource.
I think it makes more sense now as well as it's clearer.
Looking forward to hearing your opinion regarding this changes.