Improved server management