Update to keep up with framework changes and more clear to users