I will move the new functionality to EucNodeDriver and if everything is ok I will close the Pull request and reopen a new, clean one.