Changes made to accommodate framework updates