Fedora nodes refactor