Framework Improvement