Start adding support for fixed intervals