Updates to Add/Edit Data Entity