Refactor and DB design
Some mock data.