Removed use
Improved schema support
Non empty schema