Added Server Option
Changed Names