Integrate @fstrozzi pull request. Init EndPoint