Restructure to make it easier to add more rates