Dynamic Fields code refactoring.