Feature/custom time interval