Filter Model & OldModel keys

Better filtering of Model keys