Files updated for new framework