Add basic delay support