Simplify Data map for Dataset and use map for availability at node level