Changes to accommodate framework modifications