Refactoring and seed data changes