Added new FIFO support