Framework adjustments