Re-generated entities, added ID generation strategy.