adding back class exports mistakenly deleted in resolving conflicts between submitted versions