Just a todo
Now also Initial node and Final node are tags.
Did also some cleaning on the server side