data node parsing improved