Updates for framework changes