wip. upgraded Marshalers.generator and Repository.generator