Started to add validation