Refactoring of popular MRBS system