Refactor access to Fields