Added commit/ack handling