Moved 3rdpartyFields to a better position