Added 'Should' and 'Expect' flavors