Additions based on new tables and seeding scripts