Further expanding the Target Preprocessing framework