First attempt to check validity in model changes