Hi Sebastian,
you're right. I took the simplest path of solving it but obviously not the best one.
I have some ideas and questions so perhaps we could move to development forum and discuss it further and as an outcome update both jira issues with final ideas. What do you think?!
Cheers,
Maciej