Absolutely. I've just modified FieldNames in a different Pull Request #336 . May I perform that change in #336 and refactor this one afterwards?