Added additional TODO regarding messaging rate