Changed to XSL as code generator