Adding Simon and Speck engines