Cleaned up and expanded user seeding