Add Codes/delay support