Additional framework changes for flash