Yep.. maybe we should postpone the merge of this class... Can you please remove it from your PR ?