Validations and improvements