Added aditional spec. Added HTML and XML output.