|#000| +Manan| refactoring rnr service