Added field add/remove/edit functionality