Added Server parameter to improve performance and reduce conflicts