Change property to more accurate field. Add field whitelist check.