Xml2pipefield definition added, code reformat