Refactored framework support