server enhancements