Added contains to attribute expressions