Xrf data

Some small modifications.
It will double the size of dict.