Added some validationss