More expect support