Add support for is_repeat