CC @cosmin-marian - this should make your life simpler :)