Added automated entity generation.