Lot of changes
Add differents schemas