Add options delay support