Supporting Flags, fixing node map