Changed DB schems, added sample