Not quite sure how to expose this API wise, some research is needed. But it should make it clear or not if our design is on the right path. Related to #96 and #95