Added support for repeatable