Add support for server