Refactoring of xml converter + adding definitions custom attributes