Schema updated
minor bug fixed