Changes in core classes