Auto 558 entity creation

I'm sorry. I said I was sorry.