Custom serializer generator support commit #2