Imlemented getDataElementById
Resolved merge conflict