Added generic EntityAdditionMask