Improved ack support