Add offset and duration support