Refactored Frameworks