Added indexes and test seed data