Added EntitySerializer
Updated EntityUnserializer