Made dictionary / none filtering deal with nested structues.

Migrated schemas into the validation objects