Updated field helpers