Added more nodes in the yaf file. Merged the conflit in the include changes.