performance improvements in core module