Fixed schema and added some other libraries
Fixed merge conflict