added condition to mapping data elements..