Cleaning
Cleaning
Cleaning
Add support for NamedSchema