Add more entities
Merge More Entities with master