Added validator, sorry for deleting