Add checks for existence of element in dataset