adding a bit more on the support ... still some work has to be done to get proper covered all the cases we are trying to solve