TRUNK-4159 Add Orded OrderFrequency to the data model

TRUNK-4159 added fixes for comments as a result reviewing my previous commit