Osmnode refactor