Add more db fields
Fixed issue with broken renders
Merge branch 'Add_more_fields'