Wouldn't than make sense to merge this two modules into one...
not for this PR but for future..