Updated schema and data

Both should work well with sqlite. Still have to test