Add more validation to update