Expand state machine to handle minimal responses