More changes to core functionality.