Changes to framework, db, and component