Changes made to adapt to new framework modifications