Updating base with framework changes