Added support for including enemies in data gathering