Major refactor to create a common Field Base