More framework changes