Add rates expiraion and autoupdate