Added field validation annotations