Improve API and seed data