* Schemas : a little refactoring, and improvements