Refactoring of some class/method (compatibility for RPC call)