added React Element and Class support