Added interval changing support