Modified regexp's to allow XML/Alloy elements in description