Added validator class
merged in validator class