Add support for setting server