Added check for data containing a thing