[CORE-91] Fixing DB issue
[CORE-91] Fixing DB issue
[CORE-51] Updating nodes and paths