Add argument to control automatic entity creation.