added TODOs for more flexible interval support