Added Tiragraffi and updated WS with Marko