Added EntityIdUnserializer