Slight changes
Add json columns to table and change join query to includes
Merge branch 'develop'