Support for new repeat format (with legacy compatibility)