Added support for changing intervals