Add serializer and remove dictionary