Move rate properties to upper level