[PATCH] Improve rate functionality