Add support for server block