[IMP] Refactoring