Readd support for periodicity