⚠ This MR is not ready and needs additional work ⚠
Adapt changes in favor of the composition of functors
TODO: