Added more substrings