-Replaced loading new entity wrapper with using of ->node.
- Fix CR fixes, using coder module