Added validator
Resolved conflict