New constructors works fine. Next iteration should fix missing source problem and delete old Node constructors