Refactor field class