Adding support for other "servers"