Updates to support frameworks