Required -> DataRequired
fixed validation issues