Integrating Expectation Handling into Jason Surangika Ranathunga