Added more dummy entries and logic to handle many-to-many.