Working version of new serializer
Missed file