Completed Add Data Entity logic