-[HOUSEKEEPING] Corrected class exports and parameter types