Added field referencing to before and after validators