V2

This should not break any of existing code using V1 but this needs more check to be absolutely sure.