Updated to reflect framework changes