Deep Properties support added, fixes for string.Contains() support