Use Clock instead of Rate for backward compatibility of rolling

Use Clock instead of Rate for backward compatibility of rolling #721