Finishing work on rates command