AddField/AddMethod refactoring