Added check for substring in structure