CmdLet for Servers added, refactoring enum parameter handling