Added additional fieldchecks