Minor changes
Schema changed for Beta version
Minor changes