Signed-off-by: Jukka Laitinen <jukkax@ssrc.tii.ae>
Which is better for versioning and decomposability