Some refactoring and added node as meta to node-map