Added support for server