Major changes to core framework.