Seed refactor