Added individual ids when creating entities