CATS-401 CATS-402 Create and update RRD