Migrated to automatic Id generation