Update validations in modles and more