More updates to the framework.