Updated xsl transforms