Fit framework changes