Added last validations