New version with XHTML invoker