35: Added FIFO support