Added support for ServalT