Changed validator(s) from xml based to annotation based