Refactoring: field types moved to Field namespace