Refactoring (Renamed rim to rmi)