#time 20m - Entity serializing. Adding JS