Added message export support