Added SingleEntityIdFactory