Refactor field types