Refactoring to support Magento already committed cases