Add serializer from last commit