Added Entity serializing