performance improvements for server