Refactored framework