add interval handling support