Refactored framework classes