Added Siesta Output class, changed re patterns