Lots of testing configuration. Getting closer ;-) Added Update Entity. Way not finished yet ;-)