Add support for UserServ