Generator integrated from old api