Some refactoring and added helpers in meta nodes / 2