Paradime | Refactoring existing model

Updated