Improved server support