Improved server-restrictions