Field function refactor